the total number of actions is "matches + actions - 1". (Fixes #126572).

Tue Nov 18 22:26:30 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkentry.c (gtk_entry_completion_key_press): the total
	number of actions is "matches + actions - 1". (Fixes #126572).

diff --git a/ChangeLog b/ChangeLog
index e24ebc36f51e7fadde9d280316b28790c3871223..821e9efbfe889e2a0459d3046fd9f0fec20c63aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 18 22:26:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_completion_key_press): the total
+       number of actions is "matches + actions - 1". (Fixes #126572).
+
 Tue Nov 18 21:05:05 2003  Christian Persch  <chp@cvs.gnome.org>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e24ebc36f51e7fadde9d280316b28790c3871223..821e9efbfe889e2a0459d3046fd9f0fec20c63aa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Nov 18 22:26:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_completion_key_press): the total
+       number of actions is "matches + actions - 1". (Fixes #126572).
+
 Tue Nov 18 21:05:05 2003  Christian Persch  <chp@cvs.gnome.org>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e24ebc36f51e7fadde9d280316b28790c3871223..821e9efbfe889e2a0459d3046fd9f0fec20c63aa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Nov 18 22:26:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_completion_key_press): the total
+       number of actions is "matches + actions - 1". (Fixes #126572).
+
 Tue Nov 18 21:05:05 2003  Christian Persch  <chp@cvs.gnome.org>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e24ebc36f51e7fadde9d280316b28790c3871223..821e9efbfe889e2a0459d3046fd9f0fec20c63aa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Nov 18 22:26:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_completion_key_press): the total
+       number of actions is "matches + actions - 1". (Fixes #126572).
+
 Tue Nov 18 21:05:05 2003  Christian Persch  <chp@cvs.gnome.org>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e24ebc36f51e7fadde9d280316b28790c3871223..821e9efbfe889e2a0459d3046fd9f0fec20c63aa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Nov 18 22:26:30 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_completion_key_press): the total
+       number of actions is "matches + actions - 1". (Fixes #126572).
+
 Tue Nov 18 21:05:05 2003  Christian Persch  <chp@cvs.gnome.org>
 
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index e9af2193731d94b846ee1c1eccd4b4f713cf0ac7..8f97dcf5944c8534dab8ac21d03997d69631be00 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4575,8 +4575,8 @@ gtk_entry_completion_key_press (GtkWidget   *widget,
       else if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
         {
           completion->priv->current_selected++;
-          if (completion->priv->current_selected >= matches + actions)
-            completion->priv->current_selected = matches + actions;
+          if (completion->priv->current_selected > matches + actions - 1)
+            completion->priv->current_selected = matches + actions - 1;
         }
       else if (event->keyval == GDK_Home || event->keyval == GDK_KP_Home)
         completion->priv->current_selected = -1;